add geoidheight to Waypoint class.

support geoidheight in nmea and gpx reader and writers.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4793 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index f9885226b53a0e7aa9313dc1ff317bb11d4645d8..4a9f5fd5ad16a85a0848a3c45fd1e0b9bf4ba41a 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -385,6 +385,7 @@ public:
     proximity(0),
     course(0),
     speed(0),
+    geoidheight(0),
     depth(0),
     is_split(0),
     new_trkseg(0) {}
@@ -396,6 +397,7 @@ public:
   unsigned int proximity:1;            /* proximity field is set */
   unsigned int course:1;                       /* course field is set */
   unsigned int speed:1;                        /* speed field is set */
+  unsigned int geoidheight:1;  /* geoidheight field is set */
   unsigned int depth:1;                        /* depth field is set */
   /* !ToDo!
   unsigned int altitude:1;             /+ altitude field is set +/
@@ -461,6 +463,7 @@ public:
   double latitude;             /* Degrees */
   double longitude;            /* Degrees */
   double altitude;             /* Meters. */
+  double geoidheight;  /* Height (in meters) of geoid (mean sea level) above WGS84 earth ellipsoid. */
 
   /*
    * The "thickness" of a waypoint; adds an element of 3D.  Can be

diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc
index a0f6d1db9a22e9749645c328ad1994671c39ffb1..20dc6c772a65f39f19d1aa57a088927370d27b5e 100644 (file)
--- a/gpsbabel/gpx.cc
+++ b/gpsbabel/gpx.cc
@@ -99,6 +99,7 @@ typedef enum  {
   tt_wpt,
   tt_wpttype_ele,
   tt_wpttype_time,
+  tt_wpttype_geoidheight,
   tt_wpttype_name,
   tt_wpttype_cmt,
   tt_wpttype_desc,
@@ -381,6 +382,7 @@ tag_mapping tag_path_map[] = {
 
   GPXWPTTYPETAG(tt_wpttype_ele, 0, "ele"),
   GPXWPTTYPETAG(tt_wpttype_time, 0, "time"),
+  GPXWPTTYPETAG(tt_wpttype_geoidheight, 0, "geoidheight"),
   GPXWPTTYPETAG(tt_wpttype_name, 0, "name"),
   GPXWPTTYPETAG(tt_wpttype_cmt, 0, "cmt"),
   GPXWPTTYPETAG(tt_wpttype_desc, 0, "desc"),
@@ -1069,6 +1071,9 @@ gpx_end(const QString& el)
   case tt_wpttype_time:
     wpt_tmp->SetCreationTime(xml_parse_time(cdatastr));
     break;
+  case tt_wpttype_geoidheight:
+    WAYPT_SET(wpt_tmp, geoidheight, cdatastr.toDouble());
+    break;
   case tt_wpttype_cmt:
     wpt_tmp->description = cdatastr;
     break;
@@ -1417,6 +1422,8 @@ gpx_write_common_acc(const Waypoint* waypointp)
   if (waypointp->pdop) {
     writer->writeTextElement("pdop", toString(waypointp->pdop));
   }
+  /* TODO: ageofdgpsdata should go here */
+  /* TODO: dgpsid should go here */
 }
 
 
@@ -1437,6 +1444,10 @@ gpx_write_common_position(const Waypoint* waypointp, const gpx_point_type point_
       writer->writeTextElement("speed", toString(waypointp->speed));
     }
   }
+  /* TODO:  magvar should go here */
+  if (WAYPT_HAS(waypointp, geoidheight)) {
+    writer->writeOptionalTextElement("geoidheight",QString::number(waypointp->geoidheight, 'f', 1));
+  }
 }
 
 static void
@@ -1522,9 +1533,10 @@ gpx_write_common_description(const Waypoint* waypointp, QString oname)
   } else {
     writer->writeOptionalTextElement("desc", waypointp->description);
   }
-
+  /* TODO: src should go here */
   write_gpx_url(waypointp);
   writer->writeOptionalTextElement("sym", waypointp->icon_descr);
+  /* TODO: type should go here */
 }
 
 static void

diff --git a/gpsbabel/nmea.cc b/gpsbabel/nmea.cc
index f0eb56d025aa23f14aaae2845a0460eb0162c421..c673d1adafe239fe52af17977b00132b847eecb8 100644 (file)
--- a/gpsbabel/nmea.cc
+++ b/gpsbabel/nmea.cc
@@ -434,6 +434,8 @@ gpgga_parse(char* ibuf)
   int nsats = 0;
   double hdop;
   char altunits;
+  double geoidheight;
+  char geoidheightunits;
   Waypoint* waypt;
   double fsec;
 
@@ -442,10 +444,10 @@ gpgga_parse(char* ibuf)
     track_add_head(trk_head);
   }
 
-  sscanf(ibuf,"$%*2cGGA,%lf,%lf,%c,%lf,%c,%d,%d,%lf,%lf,%c",
+  sscanf(ibuf,"$%*2cGGA,%lf,%lf,%c,%lf,%c,%d,%d,%lf,%lf,%c,%lf,%c",
          &hms, &latdeg,&latdir,
          &lngdeg,&lngdir,
-         &fix,&nsats,&hdop,&alt,&altunits);
+         &fix,&nsats,&hdop,&alt,&altunits,&geoidheight,&geoidheightunits);
 
   /*
    * In serial mode, allow the fix with an invalid position through
@@ -482,6 +484,8 @@ gpgga_parse(char* ibuf)
 
   waypt->altitude = alt;
 
+  WAYPT_SET(waypt, geoidheight, geoidheight);
+
   waypt->sat   = nsats;
 
   waypt->hdop  = hdop;
@@ -1325,14 +1329,15 @@ nmea_trackpt_pr(const Waypoint* wpt)
     gbfprintf(file_out, "$%s*%02X\n", obuf, cksum);
   }
   if (opt_gpgga) {
-    snprintf(obuf, sizeof(obuf), "GPGGA,%010.3f,%08.3f,%c,%09.3f,%c,%c,%02d,%.1f,%.3f,M,0.0,M,,",
+    snprintf(obuf, sizeof(obuf), "GPGGA,%010.3f,%08.3f,%c,%09.3f,%c,%c,%02d,%.1f,%.3f,M,%.1f,M,,",
              (double) hms + (wpt->GetCreationTime().time().msec() / 1000.0),
              fabs(lat), lat < 0 ? 'S' : 'N',
              fabs(lon), lon < 0 ? 'W' : 'E',
              fix,
              (wpt->sat>0)?(wpt->sat):(0),
              (wpt->hdop>0)?(wpt->hdop):(0.0),
-             wpt->altitude == unknown_alt ? 0 : wpt->altitude);
+             wpt->altitude == unknown_alt ? 0 : wpt->altitude,
+             WAYPT_HAS(wpt, geoidheight)? (wpt->geoidheight) : (0)); /* TODO: we could look up the geoidheight if needed */
     cksum = nmea_cksum(obuf);
     gbfprintf(file_out, "$%s*%02X\n", obuf, cksum);
   }

diff --git a/gpsbabel/reference/track/amod-cleansed b/gpsbabel/reference/track/amod-cleansed
index c113e69b764594a18199b4430336b1b3f72fad77..198de0cf97e2678696122f04c09267078a12277a 100644 (file)
--- a/gpsbabel/reference/track/amod-cleansed
+++ b/gpsbabel/reference/track/amod-cleansed
@@ -2,14 +2,14 @@ $GPRMC,200641.000,V,3549.499,N,08650.824,W,0.00,224.45,050608,,*03
 $GPGGA,200641.000,3549.499,N,08650.824,W,0,00,0.0,0.000,M,0.0,M,,*74
 $GPVTG,224.450,T,0,M,0.000,N,0.000,K*55
 $GPRMC,200642.000,A,3549.499,N,08650.824,W,0.00,224.45,050608,,*17
-$GPGGA,200642.000,3549.499,N,08650.824,W,1,07,1.1,269.900,M,0.0,M,,*75
+$GPGGA,200642.000,3549.499,N,08650.824,W,1,07,1.1,269.900,M,-31.4,M,,*6E
 $GPVTG,224.450,T,0,M,0.000,N,0.000,K*55
 $GPGSA,A,3,,,,,,,,,,,,,2.1,1.1,1.8*38
 $GPRMC,200643.000,A,3549.499,N,08650.824,W,0.00,224.45,050608,,*16
-$GPGGA,200643.000,3549.499,N,08650.824,W,1,07,1.1,269.900,M,0.0,M,,*74
+$GPGGA,200643.000,3549.499,N,08650.824,W,1,07,1.1,269.900,M,-31.4,M,,*6F
 $GPVTG,224.450,T,0,M,0.000,N,0.000,K*55
 $GPGSA,A,3,,,,,,,,,,,,,2.1,1.1,1.8*38
 $GPRMC,200644.000,A,3549.499,N,08650.824,W,0.00,224.45,050608,,*11
-$GPGGA,200644.000,3549.499,N,08650.824,W,1,06,1.3,269.900,M,0.0,M,,*70
+$GPGGA,200644.000,3549.499,N,08650.824,W,1,06,1.3,269.900,M,-31.4,M,,*6B
 $GPVTG,224.450,T,0,M,0.000,N,0.000,K*55
 $GPGSA,A,3,,,,,,,,,,,,,2.2,1.3,1.8*39

diff --git a/gpsbabel/reference/track/amod.gpx b/gpsbabel/reference/track/amod.gpx
index addee31f155329bf577eae1ca90802f9669e6deb..dfa54c7b1bd560d2450f7a3a5eeec4d173aedfbe 100644 (file)
--- a/gpsbabel/reference/track/amod.gpx
+++ b/gpsbabel/reference/track/amod.gpx
@@ -14,6 +14,7 @@
         <time>2008-06-05T20:06:42Z</time>
         <course>224.449997</course>
         <speed>0.000000</speed>
+        <geoidheight>-31.4</geoidheight>
         <fix>3d</fix>
         <sat>7</sat>
         <hdop>1.100000</hdop>
@@ -25,6 +26,7 @@
         <time>2008-06-05T20:06:43Z</time>
         <course>224.449997</course>
         <speed>0.000000</speed>
+        <geoidheight>-31.4</geoidheight>
         <fix>3d</fix>
         <sat>7</sat>
         <hdop>1.100000</hdop>
@@ -36,6 +38,7 @@
         <time>2008-06-05T20:06:44Z</time>
         <course>224.449997</course>
         <speed>0.000000</speed>
+        <geoidheight>-31.4</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.300000</hdop>

diff --git a/gpsbabel/reference/track/nmea+ms.gpx b/gpsbabel/reference/track/nmea+ms.gpx
index 06d3d82af6255551861f34387993ecf9fcbe5a6f..4f11486ffd91b4ce16390345f063302f5c3a47e2 100644 (file)
--- a/gpsbabel/reference/track/nmea+ms.gpx
+++ b/gpsbabel/reference/track/nmea+ms.gpx
@@ -9,6 +9,7 @@
         <time>2007-08-17T09:31:56.500Z</time>
         <course>171.410004</course>
         <speed>0.111111</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -20,6 +21,7 @@
         <time>2007-08-17T09:31:56.750Z</time>
         <course>169.850006</course>
         <speed>0.055556</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -31,6 +33,7 @@
         <time>2007-08-17T09:31:57Z</time>
         <course>167.320007</course>
         <speed>0.111111</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -42,6 +45,7 @@
         <time>2007-08-17T09:31:57.250Z</time>
         <course>165.429993</course>
         <speed>0.111111</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -53,6 +57,7 @@
         <time>2007-08-17T09:31:57.500Z</time>
         <course>164.399994</course>
         <speed>0.027778</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -64,6 +69,7 @@
         <time>2007-08-17T09:31:57.750Z</time>
         <course>168.419998</course>
         <speed>0.083333</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -75,6 +81,7 @@
         <time>2007-08-17T09:31:58.250Z</time>
         <course>181.889999</course>
         <speed>0.111111</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -84,6 +91,7 @@
         <time>2007-08-17T09:31:58Z</time>
         <course>175.830002</course>
         <speed>0.138889</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -93,6 +101,7 @@
         <time>2007-08-17T09:31:58.750Z</time>
         <course>179.449997</course>
         <speed>0.083333</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -104,6 +113,7 @@
         <time>2007-08-17T09:31:59Z</time>
         <course>176.820007</course>
         <speed>0.083333</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -115,6 +125,7 @@
         <time>2007-08-17T09:32:00.500Z</time>
         <course>202.580002</course>
         <speed>0.138889</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -126,6 +137,7 @@
         <time>2007-08-17T09:31:59.250Z</time>
         <course>174.279999</course>
         <speed>0.055556</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -137,6 +149,7 @@
         <time>2007-08-17T09:31:59.500Z</time>
         <course>177.330002</course>
         <speed>0.111111</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -146,6 +159,7 @@
         <time>2007-08-17T09:32:00Z</time>
         <course>185.009995</course>
         <speed>0.027778</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -157,6 +171,7 @@
         <time>2007-08-17T09:32:00.250Z</time>
         <course>189.289993</course>
         <speed>0.083333</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -168,6 +183,7 @@
         <time>2007-08-17T09:32:01Z</time>
         <course>207.460007</course>
         <speed>0.222222</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -179,6 +195,7 @@
         <time>2007-08-17T09:32:01.250Z</time>
         <course>213.190002</course>
         <speed>0.138889</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -190,6 +207,7 @@
         <time>2007-08-17T09:32:01.500Z</time>
         <course>218.089996</course>
         <speed>0.277778</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -201,6 +219,7 @@
         <time>2007-08-17T09:32:01.750Z</time>
         <course>221.759995</course>
         <speed>0.250000</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -212,6 +231,7 @@
         <time>2007-08-17T09:32:02Z</time>
         <course>226.210007</course>
         <speed>0.222222</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -223,6 +243,7 @@
         <time>2007-08-17T09:32:02.500Z</time>
         <course>233.130005</course>
         <speed>0.138889</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -234,6 +255,7 @@
         <time>2007-08-17T09:32:02.750Z</time>
         <course>233.779999</course>
         <speed>0.055556</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -245,6 +267,7 @@
         <time>2007-08-17T09:32:03Z</time>
         <course>231.729996</course>
         <speed>0.055556</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -256,6 +279,7 @@
         <time>2007-08-17T09:32:03.250Z</time>
         <course>227.869995</course>
         <speed>0.055556</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -267,6 +291,7 @@
         <time>2007-08-17T09:32:03.500Z</time>
         <course>224.449997</course>
         <speed>0.083333</speed>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>
@@ -276,6 +301,7 @@
       <trkpt lat="53.556728333" lon="9.865575000">
         <ele>49.900000</ele>
         <time>2007-08-17T09:32:05.750Z</time>
+        <geoidheight>46.0</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.700000</hdop>

diff --git a/gpsbabel/reference/track/nmea.gpx b/gpsbabel/reference/track/nmea.gpx
index adec90fd181e6274d28c2735934b96a73515c211..af8260bddbf04280b80a8d354fdfa87aa74eb1b3 100644 (file)
--- a/gpsbabel/reference/track/nmea.gpx
+++ b/gpsbabel/reference/track/nmea.gpx
@@ -9,6 +9,7 @@
         <time>2004-08-07T03:29:08.379Z</time>
         <course>138.919998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -20,6 +21,7 @@
         <time>2004-08-07T03:29:09.379Z</time>
         <course>145.850006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -31,6 +33,7 @@
         <time>2004-08-07T03:29:10.379Z</time>
         <course>143.250000</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -42,6 +45,7 @@
         <time>2004-08-07T03:29:11.379Z</time>
         <course>145.759995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -53,6 +57,7 @@
         <time>2004-08-07T03:29:12.379Z</time>
         <course>141.440002</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -64,6 +69,7 @@
         <time>2004-08-07T03:29:13.379Z</time>
         <course>140.399994</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -75,6 +81,7 @@
         <time>2004-08-07T03:29:14.379Z</time>
         <course>142.509995</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -86,6 +93,7 @@
         <time>2004-08-07T03:29:15.379Z</time>
         <course>144.059998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -97,6 +105,7 @@
         <time>2004-08-07T03:29:16.379Z</time>
         <course>137.660004</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -108,6 +117,7 @@
         <time>2004-08-07T03:29:17.379Z</time>
         <course>144.229996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -119,6 +129,7 @@
         <time>2004-08-07T03:29:18.379Z</time>
         <course>140.350006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -130,6 +141,7 @@
         <time>2004-08-07T03:29:19.379Z</time>
         <course>143.059998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -141,6 +153,7 @@
         <time>2004-08-07T03:29:20.379Z</time>
         <course>145.080002</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -152,6 +165,7 @@
         <time>2004-08-07T03:29:21.379Z</time>
         <course>141.559998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -163,6 +177,7 @@
         <time>2004-08-07T03:29:22.378Z</time>
         <course>140.759995</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -174,6 +189,7 @@
         <time>2004-08-07T03:29:23.378Z</time>
         <course>143.919998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -185,6 +201,7 @@
         <time>2004-08-07T03:29:24.378Z</time>
         <course>140.850006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -196,6 +213,7 @@
         <time>2004-08-07T03:29:25.378Z</time>
         <course>145.270004</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -207,6 +225,7 @@
         <time>2004-08-07T03:29:26.378Z</time>
         <course>145.610001</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -218,6 +237,7 @@
         <time>2004-08-07T03:29:27.378Z</time>
         <course>145.139999</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -229,6 +249,7 @@
         <time>2004-08-07T03:29:28.378Z</time>
         <course>143.490005</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -240,6 +261,7 @@
         <time>2004-08-07T03:29:29.378Z</time>
         <course>145.089996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -251,6 +273,7 @@
         <time>2004-08-07T03:29:30.378Z</time>
         <course>143.000000</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -262,6 +285,7 @@
         <time>2004-08-07T03:29:31.378Z</time>
         <course>144.100006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -273,6 +297,7 @@
         <time>2004-08-07T03:29:32.378Z</time>
         <course>142.360001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -284,6 +309,7 @@
         <time>2004-08-07T03:29:33.378Z</time>
         <course>139.899994</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -295,6 +321,7 @@
         <time>2004-08-07T03:29:34.378Z</time>
         <course>145.610001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -306,6 +333,7 @@
         <time>2004-08-07T03:29:35.378Z</time>
         <course>143.770004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>5</sat>
         <hdop>1.600000</hdop>
@@ -317,6 +345,7 @@
         <time>2004-08-07T03:29:36.378Z</time>
         <course>144.649994</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -328,6 +357,7 @@
         <time>2004-08-07T03:29:37.378Z</time>
         <course>144.570007</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -339,6 +369,7 @@
         <time>2004-08-07T03:29:38.378Z</time>
         <course>144.350006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -350,6 +381,7 @@
         <time>2004-08-07T03:29:39.377Z</time>
         <course>141.220001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -361,6 +393,7 @@
         <time>2004-08-07T03:29:40.377Z</time>
         <course>146.149994</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -372,6 +405,7 @@
         <time>2004-08-07T03:29:41.377Z</time>
         <course>142.419998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -383,6 +417,7 @@
         <time>2004-08-07T03:29:42.377Z</time>
         <course>141.130005</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -394,6 +429,7 @@
         <time>2004-08-07T03:29:43.377Z</time>
         <course>144.000000</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -405,6 +441,7 @@
         <time>2004-08-07T03:29:44.377Z</time>
         <course>142.179993</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -416,6 +453,7 @@
         <time>2004-08-07T03:29:45.377Z</time>
         <course>145.289993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -427,6 +465,7 @@
         <time>2004-08-07T03:29:46.377Z</time>
         <course>144.630005</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -438,6 +477,7 @@
         <time>2004-08-07T03:29:47.377Z</time>
         <course>143.470001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -449,6 +489,7 @@
         <time>2004-08-07T03:29:48.377Z</time>
         <course>142.350006</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -460,6 +501,7 @@
         <time>2004-08-07T03:29:49.377Z</time>
         <course>143.190002</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -471,6 +513,7 @@
         <time>2004-08-07T03:29:50.377Z</time>
         <course>143.639999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -482,6 +525,7 @@
         <time>2004-08-07T03:29:51.377Z</time>
         <course>140.800003</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -493,6 +537,7 @@
         <time>2004-08-07T03:29:52.377Z</time>
         <course>141.910004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -504,6 +549,7 @@
         <time>2004-08-07T03:29:53.377Z</time>
         <course>142.309998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -515,6 +561,7 @@
         <time>2004-08-07T03:29:54.377Z</time>
         <course>140.729996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -526,6 +573,7 @@
         <time>2004-08-07T03:29:55.376Z</time>
         <course>141.190002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -537,6 +585,7 @@
         <time>2004-08-07T03:29:56.376Z</time>
         <course>142.600006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -548,6 +597,7 @@
         <time>2004-08-07T03:29:57.376Z</time>
         <course>142.809998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -559,6 +609,7 @@
         <time>2004-08-07T03:29:58.376Z</time>
         <course>140.440002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -570,6 +621,7 @@
         <time>2004-08-07T03:29:59.376Z</time>
         <course>142.369995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -581,6 +633,7 @@
         <time>2004-08-07T03:30:00.376Z</time>
         <course>139.389999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -592,6 +645,7 @@
         <time>2004-08-07T03:30:01.376Z</time>
         <course>139.869995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -603,6 +657,7 @@
         <time>2004-08-07T03:30:02.376Z</time>
         <course>141.369995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -614,6 +669,7 @@
         <time>2004-08-07T03:30:03.376Z</time>
         <course>139.160004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -625,6 +681,7 @@
         <time>2004-08-07T03:30:04.376Z</time>
         <course>142.389999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -636,6 +693,7 @@
         <time>2004-08-07T03:30:05.376Z</time>
         <course>140.449997</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -647,6 +705,7 @@
         <time>2004-08-07T03:30:06.376Z</time>
         <course>141.089996</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -658,6 +717,7 @@
         <time>2004-08-07T03:30:07.376Z</time>
         <course>140.729996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -669,6 +729,7 @@
         <time>2004-08-07T03:30:08.376Z</time>
         <course>137.970001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -680,6 +741,7 @@
         <time>2004-08-07T03:30:09.376Z</time>
         <course>144.869995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -691,6 +753,7 @@
         <time>2004-08-07T03:30:10.376Z</time>
         <course>137.610001</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -702,6 +765,7 @@
         <time>2004-08-07T03:30:11.375Z</time>
         <course>145.339996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -713,6 +777,7 @@
         <time>2004-08-07T03:30:12.375Z</time>
         <course>136.350006</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -724,6 +789,7 @@
         <time>2004-08-07T03:30:13.375Z</time>
         <course>138.580002</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -735,6 +801,7 @@
         <time>2004-08-07T03:30:14.375Z</time>
         <course>140.110001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -746,6 +813,7 @@
         <time>2004-08-07T03:30:15.375Z</time>
         <course>140.309998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -757,6 +825,7 @@
         <time>2004-08-07T03:30:16.375Z</time>
         <course>138.899994</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -768,6 +837,7 @@
         <time>2004-08-07T03:30:17.375Z</time>
         <course>142.899994</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -779,6 +849,7 @@
         <time>2004-08-07T03:30:18.375Z</time>
         <course>143.660004</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -790,6 +861,7 @@
         <time>2004-08-07T03:30:19.375Z</time>
         <course>140.869995</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -801,6 +873,7 @@
         <time>2004-08-07T03:30:20.375Z</time>
         <course>146.139999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -812,6 +885,7 @@
         <time>2004-08-07T03:30:21.375Z</time>
         <course>141.570007</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -823,6 +897,7 @@
         <time>2004-08-07T03:30:22.375Z</time>
         <course>143.949997</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -834,6 +909,7 @@
         <time>2004-08-07T03:30:23.375Z</time>
         <course>141.809998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -845,6 +921,7 @@
         <time>2004-08-07T03:30:24.375Z</time>
         <course>142.070007</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -856,6 +933,7 @@
         <time>2004-08-07T03:30:25.375Z</time>
         <course>140.210007</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -867,6 +945,7 @@
         <time>2004-08-07T03:30:26.375Z</time>
         <course>145.889999</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -878,6 +957,7 @@
         <time>2004-08-07T03:30:27.375Z</time>
         <course>139.509995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -889,6 +969,7 @@
         <time>2004-08-07T03:30:28.374Z</time>
         <course>144.059998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -900,6 +981,7 @@
         <time>2004-08-07T03:30:29.374Z</time>
         <course>143.089996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -911,6 +993,7 @@
         <time>2004-08-07T03:30:30.374Z</time>
         <course>141.050003</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -922,6 +1005,7 @@
         <time>2004-08-07T03:30:31.374Z</time>
         <course>143.820007</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -933,6 +1017,7 @@
         <time>2004-08-07T03:30:32.374Z</time>
         <course>143.529999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -944,6 +1029,7 @@
         <time>2004-08-07T03:30:33.374Z</time>
         <course>144.089996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -955,6 +1041,7 @@
         <time>2004-08-07T03:30:34.374Z</time>
         <course>142.949997</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -966,6 +1053,7 @@
         <time>2004-08-07T03:30:35.374Z</time>
         <course>142.279999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -977,6 +1065,7 @@
         <time>2004-08-07T03:30:36.374Z</time>
         <course>141.429993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -988,6 +1077,7 @@
         <time>2004-08-07T03:30:37.374Z</time>
         <course>142.059998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -999,6 +1089,7 @@
         <time>2004-08-07T03:30:38.374Z</time>
         <course>141.460007</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1010,6 +1101,7 @@
         <time>2004-08-07T03:30:39.374Z</time>
         <course>141.259995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1021,6 +1113,7 @@
         <time>2004-08-07T03:30:40.374Z</time>
         <course>145.539993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1032,6 +1125,7 @@
         <time>2004-08-07T03:30:41.374Z</time>
         <course>134.630005</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1043,6 +1137,7 @@
         <time>2004-08-07T03:30:42.374Z</time>
         <course>144.440002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1054,6 +1149,7 @@
         <time>2004-08-07T03:30:43.374Z</time>
         <course>146.970001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1065,6 +1161,7 @@
         <time>2004-08-07T03:30:44.373Z</time>
         <course>142.240005</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1076,6 +1173,7 @@
         <time>2004-08-07T03:30:45.373Z</time>
         <course>142.729996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1087,6 +1185,7 @@
         <time>2004-08-07T03:30:46.373Z</time>
         <course>141.520004</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1098,6 +1197,7 @@
         <time>2004-08-07T03:30:47.373Z</time>
         <course>141.429993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1109,6 +1209,7 @@
         <time>2004-08-07T03:30:48.373Z</time>
         <course>137.690002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1120,6 +1221,7 @@
         <time>2004-08-07T03:30:49.373Z</time>
         <course>144.580002</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1131,6 +1233,7 @@
         <time>2004-08-07T03:30:50.373Z</time>
         <course>144.809998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1142,6 +1245,7 @@
         <time>2004-08-07T03:30:51.373Z</time>
         <course>143.139999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1153,6 +1257,7 @@
         <time>2004-08-07T03:30:52.373Z</time>
         <course>143.270004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1164,6 +1269,7 @@
         <time>2004-08-07T03:30:53.373Z</time>
         <course>139.119995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1175,6 +1281,7 @@
         <time>2004-08-07T03:30:54.373Z</time>
         <course>140.070007</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1186,6 +1293,7 @@
         <time>2004-08-07T03:30:55.373Z</time>
         <course>144.720001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1197,6 +1305,7 @@
         <time>2004-08-07T03:30:56.373Z</time>
         <course>140.800003</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1208,6 +1317,7 @@
         <time>2004-08-07T03:30:57.373Z</time>
         <course>143.259995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1219,6 +1329,7 @@
         <time>2004-08-07T03:30:58.373Z</time>
         <course>138.809998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1230,6 +1341,7 @@
         <time>2004-08-07T03:30:59.373Z</time>
         <course>143.110001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1241,6 +1353,7 @@
         <time>2004-08-07T03:31:00.372Z</time>
         <course>140.100006</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1252,6 +1365,7 @@
         <time>2004-08-07T03:31:01.372Z</time>
         <course>143.550003</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1263,6 +1377,7 @@
         <time>2004-08-07T03:31:02.372Z</time>
         <course>142.119995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1274,6 +1389,7 @@
         <time>2004-08-07T03:31:03.372Z</time>
         <course>141.639999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1285,6 +1401,7 @@
         <time>2004-08-07T03:31:04.372Z</time>
         <course>143.270004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1296,6 +1413,7 @@
         <time>2004-08-07T03:31:05.372Z</time>
         <course>143.910004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1307,6 +1425,7 @@
         <time>2004-08-07T03:31:06.372Z</time>
         <course>145.970001</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1318,6 +1437,7 @@
         <time>2004-08-07T03:31:07.372Z</time>
         <course>144.000000</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1329,6 +1449,7 @@
         <time>2004-08-07T03:31:08.372Z</time>
         <course>146.250000</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1340,6 +1461,7 @@
         <time>2004-08-07T03:31:09.372Z</time>
         <course>138.979996</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1351,6 +1473,7 @@
         <time>2004-08-07T03:31:10.372Z</time>
         <course>143.100006</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1362,6 +1485,7 @@
         <time>2004-08-07T03:31:11.372Z</time>
         <course>140.429993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1373,6 +1497,7 @@
         <time>2004-08-07T03:31:12.372Z</time>
         <course>141.440002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1384,6 +1509,7 @@
         <time>2004-08-07T03:31:13.372Z</time>
         <course>142.979996</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1395,6 +1521,7 @@
         <time>2004-08-07T03:31:14.372Z</time>
         <course>145.029999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1406,6 +1533,7 @@
         <time>2004-08-07T03:31:15.372Z</time>
         <course>143.059998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1417,6 +1545,7 @@
         <time>2004-08-07T03:31:16.372Z</time>
         <course>145.490005</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1428,6 +1557,7 @@
         <time>2004-08-07T03:31:17.371Z</time>
         <course>141.300003</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1439,6 +1569,7 @@
         <time>2004-08-07T03:31:18.371Z</time>
         <course>141.190002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1450,6 +1581,7 @@
         <time>2004-08-07T03:31:19.371Z</time>
         <course>143.009995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1461,6 +1593,7 @@
         <time>2004-08-07T03:31:20.371Z</time>
         <course>140.809998</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1472,6 +1605,7 @@
         <time>2004-08-07T03:31:21.371Z</time>
         <course>140.789993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1483,6 +1617,7 @@
         <time>2004-08-07T03:31:22.371Z</time>
         <course>141.429993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1494,6 +1629,7 @@
         <time>2004-08-07T03:31:23.371Z</time>
         <course>142.300003</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1505,6 +1641,7 @@
         <time>2004-08-07T03:31:24.371Z</time>
         <course>140.809998</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1516,6 +1653,7 @@
         <time>2004-08-07T03:31:25.371Z</time>
         <course>142.399994</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1527,6 +1665,7 @@
         <time>2004-08-07T03:31:26.371Z</time>
         <course>140.330002</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1538,6 +1677,7 @@
         <time>2004-08-07T03:31:27.371Z</time>
         <course>137.770004</course>
         <speed>0.083333</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1549,6 +1689,7 @@
         <time>2004-08-07T03:31:28.371Z</time>
         <course>142.289993</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1560,6 +1701,7 @@
         <time>2004-08-07T03:31:29.371Z</time>
         <course>140.869995</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1571,6 +1713,7 @@
         <time>2004-08-07T03:31:30.371Z</time>
         <course>141.699997</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1582,6 +1725,7 @@
         <time>2004-08-07T03:31:31.371Z</time>
         <course>141.699997</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1593,6 +1737,7 @@
         <time>2004-08-07T03:31:32.371Z</time>
         <course>140.330002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1604,6 +1749,7 @@
         <time>2004-08-07T03:31:33.370Z</time>
         <course>139.050003</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1615,6 +1761,7 @@
         <time>2004-08-07T03:31:34.370Z</time>
         <course>144.460007</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1626,6 +1773,7 @@
         <time>2004-08-07T03:31:35.370Z</time>
         <course>139.029999</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1637,6 +1785,7 @@
         <time>2004-08-07T03:31:36.370Z</time>
         <course>142.190002</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1648,6 +1797,7 @@
         <time>2004-08-07T03:31:37.370Z</time>
         <course>141.350006</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1659,6 +1809,7 @@
         <time>2004-08-07T03:31:38.370Z</time>
         <course>142.449997</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1670,6 +1821,7 @@
         <time>2004-08-07T03:31:39.370Z</time>
         <course>142.000000</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1681,6 +1833,7 @@
         <time>2004-08-07T03:31:40.370Z</time>
         <course>138.740005</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>
@@ -1692,6 +1845,7 @@
         <time>2004-08-07T03:31:41.370Z</time>
         <course>137.910004</course>
         <speed>0.111111</speed>
+        <geoidheight>-34.2</geoidheight>
         <fix>3d</fix>
         <sat>6</sat>
         <hdop>1.600000</hdop>

diff --git a/gpsbabel/testo.d/nmea.test b/gpsbabel/testo.d/nmea.test
index 0a8952900f0943ab537fb012b05833742b972647..a1cfcc70649fff5b78ebdc89316eb79b4f25566d 100644 (file)
--- a/gpsbabel/testo.d/nmea.test
+++ b/gpsbabel/testo.d/nmea.test
@@ -12,4 +12,4 @@ compare ${REFERENCE}/track/nmea+ms.gpx ${TMPDIR}/nmea+ms.gpx
 #
 gpsbabel -i nmea -f ${REFERENCE}/track/amod-nmea -o gpx -F ${TMPDIR}/amod-out.gpx -o nmea -F ${TMPDIR}/amod-pure
 compare ${REFERENCE}/track/amod.gpx ${TMPDIR}/amod-out.gpx
-compare ${TMPDIR}/amod-pure ${REFERENCE}/track/amod-cleansed
+compare ${REFERENCE}/track/amod-cleansed ${TMPDIR}/amod-pure

diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc
index 876c5abb286bfe31ae8e2a2da8c6769c620a838c..cf76daf86d1257a8f259078e703fcff6e8c41be3 100644 (file)
--- a/gpsbabel/waypt.cc
+++ b/gpsbabel/waypt.cc
@@ -559,6 +559,7 @@ Waypoint::Waypoint() :
   latitude(0),  // These should probably use some invalid data, but
   longitude(0), // it looks like we have code that relies on them being zero.
   altitude(unknown_alt),
+  geoidheight(0),
   depth(0),
   proximity(0),
   route_priority(0),
@@ -595,6 +596,7 @@ Waypoint::Waypoint(const Waypoint& other) :
   latitude(other.latitude),
   longitude(other.longitude),
   altitude(other.altitude),
+  geoidheight(other.geoidheight),
   depth(other.depth),
   proximity(other.proximity),
   shortname(other.shortname),